Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 15 Mar 2010 08:18:20 +0000 (09:18 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 15 Mar 2010 08:18:20 +0000 (09:18 +0100)

Trivial merge